Auto merge of #1651 - Roysten:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 26 May 2015 20:05:48 +0000 (20:05 +0000)
committerbors <bors@rust-lang.org>
Tue, 26 May 2015 20:05:48 +0000 (20:05 +0000)
commit6c86f13312e62206a5da0443ae0d69bfd1dc1822
treef85d01f026e27e3680adb5523587cd5cdbe7d329
parent3090cc3151389283ce5f733c66464c65f02aa659
parent284c0ef9748b094284bb5525e4dab7b596cb2322
Auto merge of #1651 - Roysten:master, r=alexcrichton